Make sure `facemenu-unlisted-faces' is bound.

diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index aa0e408afcc1d7f7f1902629d0f168937da8cc6c..95eccc5c83b3efab84d48dfdd75ee1ad13ed6edc 100644 (file)
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -814,7 +814,10 @@ you are such a person.")
                       ediff-odd-diff-face-Ancestor))
               (copy-face 'secondary-selection face))))
     ))
-      
+
+(or (boundp 'facemenu-unlisted-faces)
+    (setq facemenu-unlisted-faces nil))
+
 (add-to-list 'facemenu-unlisted-faces 'ediff-current-diff-face-A)
 (defvar ediff-current-diff-face-A
   (if (ediff-window-display-p)